Merged.
authoremellor@ewan <emellor@ewan>
Fri, 23 Sep 2005 15:57:13 +0000 (16:57 +0100)
committeremellor@ewan <emellor@ewan>
Fri, 23 Sep 2005 15:57:13 +0000 (16:57 +0100)

Trivial merge